Changed Timestamp to long