Fixed database handler's methods