updated mapper with relevant fields and docblock