Add various structural modifications