Add EPV support
Udpate to EPV requiriments