Added ability to have "null-storage".