Further work on app storage module.