Added location lookup