XD-1031 Make datatypes and isIdentifying work

* plus code review changes