Updated model and database with safer save methods