Fix discovery.getService
Add database service