Refactor away from BASE-FIELDS idiom