Move to transaction class