Got rid of newInstance() usage