Re add support libraries, disapperared in the merge it would seem