Added more details to Domain classes