Adjusted database scheme