Redesign DAL of both Remote and Local storages