Handler now returns appropriate thrift types