Code design updates