Optional C-s mapping

Default still unchanged