added first and last name fields and auto entity labels