Modified YDEntitiesContext class Commit.