New package structure, replace NullClass with Object