More work on Infuser