Added validation to other than string types