Enable chaining
Update demo to use chaining