Fields refactored in different files