User-Field mega refactoring