IS Repository simplified a bit more