New mappings for next deploy