Added stubs for storage