Decoupled from existing Cycles code