* Carver mappings * Apply suggestions from code review Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Fix grimstone Co-authored-by: liach <7806504+liach@users.noreply.github.com>