Updated schema to be more first user friendly.