Working on generalizing the database models and datasources