added extended menu support