Add additional EAP versions
Add support for running from command line