Changed to use addBitlessHandler