Made changes to structure of database as per Chemox's request