Made gateway compliant with it's interface