change database to extended dataset and implementation