Common config changes
Added StorageAware
Bug fixes