Refactor ParseField to support all fields deprecated