Dev/issue 6596 aip restore v3

I like this refactoring of the base request logic!