Add support for previous weapon switching