Cleaned up dataset storage and plan changing