Updating to work with latest clutch boilerplate