Simplifying the Repository