TDS-435;
Handle Collection FILES better.