Added Menu entity
Added CustomMacros, but it doesn't work :(