Add expr, factor and uname