Continued to add to schema