Added checks for indexed and stored content model properties.