Updated context renderer