Added more general shortcodes