added rest of the types