Invoke request factory re-factoring