added logic to dnd parameters to differentiate

classes and properties