Moved idType lookup to schema
Merge