Adjustments to allow Bytecode Reading to support the BytecodeHandler