Review mappings to remove precondition