Add more support for /back