Added context to Entry