Forgot something in CMakeLists + Better services