Taken out reference to BaseFactory. added same functionality to HVClientHelper