Changed architecture and OS blocks to lists.