Further design updates for references