Modify rights system. Tests to be continued...