Added additional CPU architecture support