Incorporate FilterChain changes