Fixed MAP
Fixed NOT, TOGGLE-CLASS, SERIALIZE