Started implementing transaction management