some small changes on parsing the databases