Fix to check if schema passed through