Catch up with Tecla framework package refactoring