adapted infrastructure to ehome