reconfigured propertyholder + added parameters