Moved from internal to api
Updated for packet repackage