Added support for dot in input