Added and support to Expression Builder