Added code renderer support