Fix models not showing up in docs
Fix various schema related issues