Updates for [daisy] upgrade