Adding ep-engine from 2.0.2