Expanded fill script to support scans and results Added type to scans and association proxy to scan_type to result