Further improvements Menu API