Added domain and bean mappers