Merge "Adjust type hints in database related classes"