Allow storage path to be specified/overidden

Allow storage path to be overriden while maintaining the default for backwards compatibility.