Update code in common