Add support for capstan