Moved generic renderer functionality to basic renderer