Added runtime storage option