Updated for Rapture Core 1.1