Add winchester support