Changes for gaffer 0.5.0