Simple location support added