Better context handling.