Added location model and service