Updated repository model