Enhanced outline and semantics of organization dsl.