New and improved import and validation