Add better FES support