MenuFactory extended