Updated schemas to be more first user friendly.