Added retained and discard selectivity