Add initial fish support