Implement awesome new schema that will be awesome