JTA changes, changed from manager names to qualifiers, some refactors