Fixed issue: PHPDoc fixes
Fixed issue #692: roles and users IDs merged in one class