Added class filters based on discussion with George, Kathy and Crites