Added schema setup