Preparing for renderer revamp