CMS-3546 TextComponent - Make it work