Added TypePackage and other things