Issue #8 : enable domain selection