added super tab and removed obsolete mappings