Added new token filters as preparation for level 2 serialization