Add domain handling and defaulting
1.0.2