Added schema
Some changes