Update for Sabine's modules