Updated to include mapping and whitelist.