Changes to support multiple resources for each feature in menu.xml