Add better support for YCM