Changed setup for Storage to have a consistent api