[Storehouse] Interface Changes + Injection