Added Type class in domain