Utilize more general copy function instead of extract
Update submodules