[WIP] Get ready for MenuBundle 2.0