[ActiveContext] Improvements
epic