Fields markup refactoring