Added comparator data to API
Merge branch 'master' into nlforms