Add SCHEMA back in