Added context parameter authentication for consistency