Schema almost complete