Added several YCM options