Fixed more references to old Storage mehtods