Add MenuFactory
Convert filters to factory design pattern