Improve data source, importing and specs