[WCP-20] - Moved back session Factory.