Added context to authenticated handlers