Use map of type names to numbers from Common