[PM] As was pointed out in review, I need to define a custom swap in