Updated for penguin-client API changes