Added cuttlefish support