Changes for @inject support



<!---
@huboard:{"order":591.0,"custom_state":""}
-->