update for BlocksKit 2.x