Update to new generic layout