Reworked script to match CKAN comments