Added  support for criteria, criterion and curve.