Markup class
Documentation revamping