Cleanups, added schema