Updates to include common code