Change the params to be instanced and not static to allow parallel run