add Storage and Manage rights check