Refactored Bogus gateway