Using StorageInterface rather than Vars