[CORE] Update basic block creation