More NS fixes

Seems like Entities dont like alias of DateTime