Moved EAP code into the config file