Addaoted to new Repository design