Added classes and filtering