Improvements
Implemented fallbacks
Improved domain handling
Improved PO support
Fixed unit tests