Changes for Clara 1.0.0-beta1