Added schema changes to support #104