Added markedup support