Refactored Payment to Transaction