Replaced some fields to better map to those in the database