Improve db service registration