Completely reworked the repository element