* Few improvements/refactorings
* After testing both gateways working together - everything seems ok