CH-1164 Use the parameters for getInstance instead of setting variables