Issue #45. Branch Iss#45. Update: DataBundle classes require update to function properly.