Location support added