Refactored context properties