Adding EPA support