Improved CMakeFiles