Added menu infrastructure