updated classes in domain + room mapper