MovementToken.defined() improved