Added context paramtere