Add mapping functions for massaging individual fields