Added cinder usage checks