Work on refactoring the Db component