Added context to render