Added extra database columns to specify expired swing/option values