Domain extract minor changes, soon will be replaced with extended items