Add InputControl
Move to .NET 4