Add faye support