Move to new tubes API