Feature in Neo issue 53