Rework for good database convention
Don't commit the db