Optimize references