Change ids to support adding additional parts