Detached PublishedProperty - refactor