Work on the refactoring of the Db component