Make some modifications to the schema

Add the answer to the question. Remove the passed function.