Adds checks for existence of kind property