DateTime scale major rework and bug fixes
Data Generator bug fixes