Moved fields to correct table