Minor improvements
Finish extract domains option