Add database selection based on URI
Add configurable timeout