Add typehint.
Remove setting database to NULL.