Removed dependency on the user name.