No more filenames
Adding improving models and data extraction