added Timestamp conversion