Added injected session class

This removes the dependency on a specific namepsaced session object.
Fixed a bug with duplicate methods
Cleanup