Add support for Sandstorm