Update menu functionality for SDK 3.0.x