completing common userfiles handling overhaul