Add MarkupField and unit tests