Performance fixes
Add schema