add some sugar specific infrastructure changes