added more keywords and database functionality