Added roles and users support