ENH: Increase space of solution exploration