Merging nimsdata refactor into post branch