Changes to wrapper.py for supporting any user