Polished Modifier creation and added unique check