Updated services to selector API