Added more features to the databases