Added Menu class
Added entry.*