Small changes with user files wiring