Move local storage management to service