added firstName and lastName fields