Implement new expression API