Reorder and complete polymorphic properties