Upgrade to the new clues distribution (1.1)
Allows optional arguments