Add support for object store and platform definitions