speed up database and added lots of okapi types