Added location and contacts support