changed database models and database population script