Refactor - Initial abstraction of PropertyManager