[IMP]: Improve access rights