Added ClickStart support