Added check for integers and float