#5 Extended Repository API