Rewrite with new sbar-inject version
Added dependencies
refactoring