Added type classes