Added schema back