Fix token behavior and inheritance