Little enhancements
Add possible epl authentication