Added architecture and OS settings