Added test,Prod and Local changes on propertyManager