Update to System-Independant Architecture