Source Files interface updated to be more consistent