Added support for vibe