Further design updates