Updated StorageHook to work with FeatureMapper return type ViewGroup