Unify handling of complex and entity types when creating properties