Use storage property for easier testing