Added algebraic function support