Fixed/Changed date to timestamp