More work to do in support for defectors