Shortcoder optimized and added