Added functions for shortcode