Refactored bundle and added media categories