Add schema back in