Added Base bundle and configuration