REFACTORING:  Removing ITransactionable and circular reference