Added a few more YCM options