Added type and new package name