added a couple of new markup types