Added menu and Swarm support