TransactionManager and some other minor changes

Added TransactionManager and some other minor changes