Changes for @inject support
Fixes #35