First try of schema and instance
Updated schema and data