added menus, maps and structs