Added 2 new options available in EAP build