Fix class name "Database" --> "DatabaseBase"

Also add type-hint!!!!!111

Change-Id: I69e378cbf3e1967131b8c778574f6ea4045766ab