Added type maps to help with querrying supported type names