View class refactored for bundles support
Bundles support