Fix expandRefs
Simplify and improve rebinging
Cache models on a per service basis
Directly import http symbols so they can be rebound when mocking
Fix table defintion