Updated so each field has a bean setter