Upgraded shortcode types

Shortcode types now support nested shortcodes as well.