Added more Toolkit combinations