Refactor to remove java.lang.reflect.Constructor import