Add some requirements
Merge back from dilen.