Add restore suuport. Separate declaration of file listing for decoupling purposes