Since uid and nid are now configured as user and node properties, the wrapper gives objects, not IDs. Also cleaned up some spacing