Improvements for CMAKE file