Adding menu support