Modifications to work with new cwrcwriter.