Updated for gaffa 1.x.x