Better handling of card updates, prepare bundle handling