Update to include Input fields