Fetaure/field refactor