Add expression classes