Added Database.Type enum and @Deprecated a couple more int-based methods