Do not change-class. Create correct type directly
Remove unused initialize-instance method
Fix file dependency