Support the latest skate api