Further improved database