Added Logic expressions to toolkit