BVTCK-39 Adapting to 1.1.0.CR1 spec structure