Refactor of PropertyManager