Added Safari support