Added built-in context binding and context-aware removal