Added array strucutre back in and new shortcode as per etherpad