Add better math functionality