Added validations

Line is too long. [107/80]