Refactored context.