added schema and tweaks