Refactored a context class
Dynamic menu