Added the name of the type instead of numbers