also, please use Option[Long] for both reference and timestamp