Added Users and Roles to Samples600 export