Fixing gateway definition and make tatuk command