Use proper fields to detect which sdk type there is currently.

 Closes #560