Schema changes

Updated to you know... be valid