Changed all datetimes to offset-aware