Update for fay 0.20