Some enhancements on source updating