Add working encoder