Modified DataManager & NNManager