Get rid of AdvancedField class
Updated version