Some cleaning up
Added some function in BasicTransaction and made use in Aggregate