Added some more EAP 6.1 mapping stuff