Use trigonometric models (#898)