Changed class instantiation to match constructor