Added shortcodes for key & output