Updated to use BlocksKit 2.0.0