Added roles and users and standalone modifications.