Changed data types storage to store guids instead of ids.
Update the GUID, seems to not default properly at times
Merge branch 'pr/94' into develop