Resolved more field mapping issues, updated bureauCode