Added Type class