Allow unbinding to prevent memory leaks
Better updating logic