Updates to the resolving system to use Schema based modules

Main code rev. 1907