Update to use Tarano's database