added more expr definitions