Updating to use package-scanned *Service beans