Add more capavility to handle inner shortcodes