Add a property to see where the files are comming from
Fine tune the well-known service subsystem