Input improvements