I support we need to refactor current ApplicationStorageImpl, while it looks not an urgent task.