Repackaging
Update sample code