Add required fields for customer primitive and other changes along the way