Update Configuration and add Gateway