Support for old shortcodes and added class section