Add fish support