Added desktop support