Added system database handler