Updates to common code