Configuration management of engineering artifacts with automatic identification of related change sets based on type system

A user input initiating delivery of a first change set to a stream maintained by an artifact management application can be detected. A first set of elements and a first set of elements types associated with the first change set can be identified. A second set of element types that pertain to at least one unit of work identified for the first set of elements can be identified. A second set of elements that are involved in the same unit of work can be identified. A second change set modifying the second set of elements can be identified. A third change set modifying at least one element type can be identified. A change set group can be created and the first change set, the second change set and the third change set can be added to the change set group. The change set group can be delivered to the stream.