Location supported added (partially anyway)