Updated to match NewEncoder classes