Changes in encoder API