A Mosaic-based implementation was added