Made change to static instantiations