Update to use new croogo classes