Fix dropping by list
Rename classes for properties