TeBlock framework improvement