Fixed database handler