#114 replaced the use of BladeBase with NonBlockingBladeBase