More generic propertymanager

what do you think of this?