Hopefully finished the schema