Fix to allow indexed elements when mapping heirarchy elements