Fixed configuration to new style return syntax to keep in line with framework changes.