Added locality assignment