Updated register layout