Updated to work with the latest cwrcwriter API.