Refactored by adding block container to block bundle