Support WILL

Contribute to WILL