New cuttlefish api & unit test