Updates

Added validations.