Done core changes  for multi domain feature