Encoder refactoring