Added authenticated check