Added unknown and Model types and fixed bools.
Merged changes from dev branch.