Fixed all expression creation logic