Updated field names to match that in asssignment