Added the rest of the types