Added support for Shuttle