TSTGITPLUG-1 refactoring