added Encoder constant and updated keywords