Update to newer layout