Added numbers checks