Added onAdd and onRemove to Modifier