More implementation of the database backend
Merge commit 'e2c53ac'