Expanded RecipientType with Room and resource and moved some code to the constructors