Add schema name to message when raising SchemaNotFoundError
Fix ResourceFactory