Enhanced EstatePropertyFactory