Added encoder