Updated schemes and Encoder