Add schema
Give schema the once over