Fix mapping functions, add save to replies