Fixed context building