IDEX-1634 Added factory to AppContext