TeBlock Framework improvement #2