Added packet.* and session.*, forgot to add those earlier