Changed field order to match entity name