Context refactored. Removed unnecessary complexity.