Improved DataTime load and updated modules