Extended database and removed some comments