User/Roles fixes

Roles and users IDs merged in one class