added some elements to Expression