Added some constraints/validations.