Little change in Domain code