Added horizon and cinder support