Upgraded to work with CKAN 2.2