WIP Add suite support