Adding Fish class instead of mess.