Further changes to Expression object for adding arguments