Moving some personal functions out of submodule