Moved external services into ExternalService.java