work on default field refactoring