RTGOV-341 Further refinement - moved factory into activity module and called directly