Remaining shcemas added