US604 - Updated fields as per requirements changes