Add common code