Updated for new modular Rapture