Some renaming + to mention Repository pattern from last commit