Enhance && fix manage rights