Changes to use newInstance