MarkerTokenizer renamed to AttributeTokenizer