Ensure repository stays generic