Using newer cuttlefish datatypes