Change property logic moved to controls