More updates to support BuildSystemFacet. Needs review. I have tests though :)