Add compatibiliy for embeded data store