Address layout updates