added mappers to control serialization