Update to use mosaic-commons