Improve value input