Added context and view