Working on adding custom renderer support