Updated several attachment points.