Updated submodule, no longer using parameterized classes