Added context for logged in users