Improved Cmake libs