Ntentan datasource now supports loading data directly from models or using fields
Some reorganisation