Added more object validations.