Moved some functions into static classes
Improved page level propagation trigger
Backup restore WIP