Added non-indexed extra data to database code.