Updated packet and key handling