Change to forName, disable primitives