Changed savePackage so it's easier to send along extra content data.