Further improvements; added indexes to schema tables.