Change Storage To IStorage, this will be a Database interface