Temporary disabled bundles + bit refactored structures