Updated services to take userId