initial modifications and fixes in new 'schema' module