Added architecture setting to distinguish architecture