Improved class matching.  Added DefaultPath and RequestId loading.