Field pieces refactoring