Addition of database and client ID functionality.