updated categorizedandroidsourcessinks parser