Improved input config