-fixed many bug with onAdd/onRemove -onAdd/onRemove now works even when system haven't update callback