improved "eap_types" dict