Expanded the expression api.