Updated to new config option and retrieving gateway system.