improve first import, simplify schemas