Made a conditional less specific
Use the nobody user by default
No longer use a wrapper class / method instead
Fixed merge conflicts