Changed gateway type to string