Reworked the repository element