Data management additions, bugfixes