Adding schema changes and tests