Refactored internal context into separate class