added tockenize on enter support