Missing fields refactoring