Factories updated
Added DI stub, removed table gateway