Full support for existing data model with offline and external system properties
Cleanup