Domain Structure improvments