Updated for Cinder 0.8.5