removed coupling to EVFramework