Added type map