improved database and model for germany