Add file locks to storage and ACL stuff