Added onAdded and onRemoved