Updated for filter adaptors