Some improvement started for shortcode abstract class