Added indexed rendering support