Added encoder module