Removed some architecture differences