Added RequestFactory support