Database -> HTIDatabase (Refactoring)