Updated to 2.5, added -cloud libs