Improved permissions and tags