bulk update to conform to o.1.0 spec