Merging pull request: 2787b4f - splitting payment into abstract models