We want to standardize and brea up the add spec.