Added Org and User Fields