Updated the model, improved the DB filler