Updates to mapping and exceptions