Switch to class-based writers