Database improve