Sources managment improvements and fixes
Status improvements and fixes
Sources managment improvements and fixes