Added additional options for markup control