Few changes in renderer