Work on upgrades/tweaks to the Pop\File component