Made minor schema changes as requested.