Markup inheritance refactoring