Fixed issue with trim
Added timezone type