Added basic block tables logic