Added location functionality