Expanded dataset parser and basex storage to accommodate handling output data, identifying them with a Some(prefix) rather than None (for backwards compatibility)