Moved types to xidb/types
Fixed type assignment
Missed one type assignment fix