I can define a @PlanningSolution.entity : PlanningEntity field in data modeler. I want to annotate the field with @PlanningEntityProperty but I can only see the checkbox labeled "Planning Entity Collection" which obviously adds the @PlanningEntityCollectionProperty. There needs to be a way to add the @PlanningEntityProperty as well.

In my opinion the best way would be to have a single checkbox with a general label (maybe just "Planning entity") which would add one of the two annotations depending on whether the field type is a collection or not.