Replace client with interface