Shortcode provider and fix edition issue