Removing TODO
Fixing Text supported renderers