T61 -- Commit 11 : Improved database functions.