Now uses the services plugin