Make updating Advanced Menu a simpler task

Change-Id: Iaf86e006ff4a67e72fe6c8141068ec2e36360671