First commit, have update the fields to align with motor insurance