Add suite support