Updated along with EpLibrary