Update mappers with new type definitions [SERINA-11]