Added some usefull tags
Added more checking
Removed acl check
Added more checking