Updated the patch to use dependency injection for database service.
Thanks!