Update to use samermod as default